bitkeeper revision 1.1159.170.110 (42527636gInunc40rkIVZVCuDC-_OQ)

Merge

diff --cc .rootkeys
index 6231a0c75c4d0f8fd4579d75fcc7e36a9136d1ac,6f778d6167a3b31dfce37291f0bffbf785df5e32..9aec9ae2dc44cfd3ed4181f61c81ce47cf3eb220
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -855,8 -933,8 +936,9 @@@
  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
  3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
  40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
 +422f0995xCgnbsVhTjSncnqIABs64g xen/include/xen/adv_sched_hist.h
  3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
+ 41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
  3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h
  3ddb79c259jh8hE7vre_8NuE7nwNSA xen/include/xen/config.h
  3eb165e0eawr3R-p2ZQtSdLWtLRN_A xen/include/xen/console.h

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/python/xen/xend/server/SrvDomain.py
Simple merge

diff --cc xen/common/schedule.c
index 3334c19ce0e7ba3ba9fd3bee3a7aea9146560a81,0470f9ee17b7e340fa2c6efd2021acbf7064c6be..9247232a935031a69bcc4ab71cbaee3a68e94726
--- 1/xen/common/schedule.c
--- 2/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@@ -381,18 -356,13 +374,16 @@@ static void __enter_scheduler(void
  
      spin_unlock_irq(&schedule_data[cpu].schedule_lock);
  
-     /* Ensure that the domain has an up-to-date time base. */
-     if ( !is_idle_task(next) )
-         update_dom_time(next->shared_info);
- 
 -    if ( unlikely(prev == next) )
 +    if ( unlikely(prev == next) ) {
 +#ifdef ADV_SCHED_HISTO
 +        adv_sched_hist_to_stop(cpu);
 +#endif
          return;
 -    
 +    }
      perfc_incrc(sched_ctx);
  
+     cleanup_writable_pagetable(prev);
+ 
  #if defined(WAKE_HISTO)
      if ( !is_idle_task(next) && next->wokenup ) {
          ulong diff = (ulong)(now - next->wokenup);
@@@ -422,13 -393,10 +413,14 @@@
       */
      clear_bit(DF_RUNNING, &prev->flags);
  
-     /* Mark a timer event for the newly-scheduled domain. */
-     if ( !is_idle_task(next) )
+     /* Ensure that the domain has an up-to-date time base. */
+     if ( !is_idle_task(next) && update_dom_time(next) )
          send_guest_virq(next, VIRQ_TIMER);
  
++
 +#ifdef ADV_SCHED_HISTO
 +    adv_sched_hist_to_stop(cpu);
 +#endif
      schedule_tail(next);
  
      BUG();